Shm by bartosz-gruszczyk · Pull Request #110 · coders-school/object-oriented-programming

bartosz-gruszczyk · 2021-09-13T19:35:50Z

SHM part 2
authors: @bartosz-gruszczyk @ploWoj @Regggis @Morfiniusz

…ere (from hpp files).

…s 'Cargo'.

…al changes

…land.hpp in map.hpp.

…rator== in subclass Coordinates

lukasz-kukulka

You mixed formatting style with brackets, sometimes you use:
function() {

}
sometimes:
function()
{

}

lukasz-kukulka · 2021-09-14T07:10:00Z

shm/cargo.cpp

+    } else {
+
+    }


Redundant else

lukasz-kukulka · 2021-09-14T07:14:39Z

shm/game.cpp

+void Game::sell()
+{
+    std::cout << "Your are selling. Remember that selling will take one day!\n";
+    if (!map_.getIsland(player_->getPlayerPosition()))
+    {
+        std::cout << "Captain, we are on the sea, you can not sell enything!\n";
+        return;
+    }
+    if (player_->getAvailableSpace() == CAPACITY)
+    {
+        std::cout << "Captain, we have nothing to sell!\n";
+        return;
+    }
+    std::cout << "What you want to sell?" << '\n';
+    player_->printCargo();
+    std::cout << "At store prices: \n";
+    auto actualStoreVector = map_.getIsland(player_->getPlayerPosition())->getStore()->getCargoOfStore();
+    std::vector<std::shared_ptr<Cargo>>::iterator atStore;
+    for (auto object : ship_->getCargosVector())
+    {
+        atStore = std::find_if(actualStoreVector.begin(), actualStoreVector.end(), [&object](const auto &atStore)
+                               { return object->getName() == atStore->getName(); });
+        if (atStore != actualStoreVector.end())
+        {
+            std::cout << "Name: " << (*atStore)->getName() << ", Price: " << (*atStore)->getPrice() << '\n';
+        }
+    }
+    std::cout << ship_->getCargosVector().size() + 1 << " Exit\n";
+    int sellOption = 0;
+    std::cin >> sellOption;
+    while (ship_->getCargosVector().size() < sellOption)
+    {
+        if (sellOption == ship_->getCargosVector().size() + 1)
+        {
+            std::cout << "Enough trade for today.\n";
+            return;
+        }
+        std::cout << "Segmentation fault Captain, you have to change your decision!\n";
+        std::cin >> sellOption;
+    }
+    auto objectToSell = ship_->getCargosVector()[sellOption - 1];
+    std::cout << "Amount of " << objectToSell->getName() << " to sell:\n";
+    int amountOfCargoToSell = 0;
+    std::cin >> amountOfCargoToSell;
+    while (objectToSell->getAmount() < amountOfCargoToSell)
+    {
+        std::cout << "Captain, we don't have so many of " << objectToSell->getName() << " What we do now?\n1. Change amount\n2. Exit" << '\n';
+        std::cin >> sellOption;
+        if (sellOption == 1)
+        {
+            std::cout << "Amount of " << objectToSell->getName() << " to sell:\n";
+            std::cin >> amountOfCargoToSell;
+        }
+        else
+        {
+            return;
+        }
+    }
+    atStore = std::find_if(actualStoreVector.begin(), actualStoreVector.end(), [&objectToSell](const auto &atStore)
+                           { return objectToSell->getName() == atStore->getName(); });
+    ship_->unload(objectToSell, amountOfCargoToSell);
+    player_->setMoney(player_->getMoney() + (*atStore)->getPrice() * amountOfCargoToSell);
+    map_.getIsland(player_->getPlayerPosition())->getStore()->addCargo(objectToSell, amountOfCargoToSell);
+    time_->onTimeChange();
+}


To long function, you should split this for more

lukasz-kukulka · 2021-09-14T07:16:10Z

shm/game.cpp

+void Game::travel()
+{
+    std::cout << "Where you want to travel?\n";
+    int islandCounter = 0;
+    std::vector<int> daysToGo;
+    daysToGo.reserve(map_.getEveryIsland().size());
+    for (auto island : map_.getEveryIsland())
+    {
+        int amountOfDays = island.getPosition().distance(player_->getPlayerPosition()) / ship_->getSpeed();
+        if (amountOfDays == 0 && !(island.getPosition() == player_->getPlayerPosition()))
+        {
+            daysToGo.push_back(1);
+        }
+        else
+        {
+            daysToGo.push_back(amountOfDays);
+        }
+        islandCounter++;
+        std::cout << "Island " << islandCounter << " Travel time: " << daysToGo[islandCounter - 1] << " days\n";
+    }
+    std::cout << ++islandCounter << ". Exit\n";
+    std::cout << "Where are we going captain?: ";
+    islandCounter = 0;
+    std::cin.clear();
+    std::cin >> islandCounter;
+    while (islandCounter > map_.getEveryIsland().size() + 1)
+    {
+        std::cout << "Captain you have old map! Here is new one, so where we are going?: \n";
+        std::cin.clear();
+        std::cin >> islandCounter;
+    }
+    if (islandCounter == map_.getEveryIsland().size() + 1)
+    {
+        std::cout << "I changed my mind, we stay here!\n";
+        return;
+    }
+    player_->setPlayerPosition(map_.getEveryIsland()[islandCounter - 1].getPosition().getPositionX(), map_.getEveryIsland()[islandCounter - 1].getPosition().getPositionY());
+    for (int i = 0; i < daysToGo[islandCounter - 1]; i++)
+    {
+        time_->onTimeChange();
+    }
+}


The same as sell function

lukasz-kukulka · 2021-09-14T07:16:22Z

shm/game.cpp

+void Game::buy()
+{
+    auto IslandWeAreOn = map_.getIsland(player_->getPlayerPosition());
+    if (IslandWeAreOn)
+    {
+        std::cout << "Buy. Remember that buying will take one day!\n";
+        std::cout.flush();
+        std::cout << *IslandWeAreOn->getStore() << '\n';
+        std::random_device rm;
+        std::mt19937 gr(rm());
+        int EasterEggPossibilities = 20;
+        std::uniform_int_distribution<> EasterEgg(0, EasterEggPossibilities);
+        int whahappen = EasterEgg(gr);
+        if (whahappen == 10)
+        {
+            std::cout << IslandWeAreOn->getStore()->getCargoOfStore().size() + 2 << ". Maybe round of Gwent?\n";
+        }
+        std::cout << "What do you want to buy: \n";
+        int storeIndex = 0;
+        std::cin.clear();
+        std::cin >> storeIndex;
+        while (storeIndex > IslandWeAreOn->getStore()->getCargoOfStore().size())
+        {
+            if (storeIndex == IslandWeAreOn->getStore()->getCargoOfStore().size() + 1)
+            {
+                std::cout << "Get back on the ship, you scums!\n";
+                return;
+            }
+            if (whahappen == 10 && storeIndex == IslandWeAreOn->getStore()->getCargoOfStore().size() + 2)
+            {
+                std::cout << "Winds howling... (O'Dimm theme starts playing...)\n";
+                return;
+            }
+            std::cout << "Too much rum, captain?  Choose one more time: ";
+            std::cin.clear();
+            std::cin >> storeIndex;
+        }
+        auto CargoWeAreBuying = IslandWeAreOn->getStore()->getCargoOfStore()[storeIndex - 1];
+        size_t amountOfCargo = CargoWeAreBuying->getAmount();
+        std::cout << "Amount (from 1 to " << amountOfCargo << "): \n";
+        int amountOfCargoToBuy = 0;
+        std::cin.clear();
+        std::cin >> amountOfCargoToBuy;
+        if (amountOfCargoToBuy > amountOfCargo)
+        {
+            std::cout << "Captain, they didn't have " << amountOfCargoToBuy << " of " << CargoWeAreBuying->getName() << ". We bought only " << amountOfCargo << "\n";
+            amountOfCargoToBuy = amountOfCargo;
+        }
+        int choose = 0;
+        if (CargoWeAreBuying->getPrice() * static_cast<size_t>(amountOfCargoToBuy) > player_->getMoney())
+        {
+            std::cout << "Captain, we do not have enough money! We can only buy " << player_->getMoney() / CargoWeAreBuying->getPrice() << " of " << CargoWeAreBuying->getName();
+            std::cout << ". What we do now? \n1. Buy other amount of " << CargoWeAreBuying->getName() << "\n2. Exit\n";
+            std::cin.clear();
+            std::cin >> choose;
+            if (choose == 1)
+            {
+                std::cout << "Amount (from 1 to " << player_->getMoney() / CargoWeAreBuying->getPrice() << "): \n";
+                std::cin.clear();
+                std::cin >> amountOfCargoToBuy;
+            }
+            else
+            {
+                return;
+            }
+        }
+        while (player_->getAvailableSpace() - amountOfCargoToBuy < 0)
+        {
+            std::cout << "Captain, our cargo is full, we can only buy " << player_->getAvailableSpace() << " of " << CargoWeAreBuying->getName() << ". What we are doing now?\n";
+            std::cout << "1. Set other value\n2. Exit\n";
+            std::cin.clear();
+            std::cin >> choose;
+            if (choose == 1)
+            {
+                std::cout << "New value: \n";
+                std::cin.clear();
+                std::cin >> amountOfCargoToBuy;
+            }
+            else
+            {
+                return;
+            }
+        }
+        ship_->load(CargoWeAreBuying, amountOfCargoToBuy);
+        IslandWeAreOn->getStore()->loadShip(CargoWeAreBuying, amountOfCargoToBuy);
+        player_->setMoney(player_->getMoney() - CargoWeAreBuying->getPrice() * static_cast<size_t>(amountOfCargoToBuy) < 0 ? 0 : player_->getMoney() - CargoWeAreBuying->getPrice() * static_cast<size_t>(amountOfCargoToBuy));
+        std::cout << player_->getMoney() << '\n';
+        player_->countAvailableSpace();
+        time_->onTimeChange();
+    }
+    else
+    {
+        std::cout << "Captain, we are not on any island!\n";
+    }
+}


The same as sell function

lukasz-kukulka · 2021-09-14T07:16:42Z

shm/game.hpp

+        Exit
+    };
+
+


Redundant line

lukasz-kukulka · 2021-09-14T07:38:07Z

shm/ship.cpp

+void Ship::load(std::shared_ptr<Cargo> &cargo, size_t amount)
+{
+    auto findCargo = findMatchCargo(cargo);
+


Redundant line

lukasz-kukulka · 2021-09-14T07:38:17Z

shm/ship.cpp

+
+    if (findCargo != cargos_.end())
+    {
+


Redundant line

lukasz-kukulka · 2021-09-14T07:39:13Z

shm/ship.cpp

+    }
+    else
+    {
+


Redundant line

lukasz-kukulka · 2021-09-14T07:40:07Z

shm/ship.cpp

+}
+void Ship::nextDay()


You need to separate this functions

lukasz-kukulka · 2021-09-14T07:40:28Z

shm/store.cpp

+
+

Redundant lines

ziobron · 2021-09-14T07:44:02Z

Thanks @lukasz-kukulka for Code Review.
🏅 1 XP granted

nauka-programowania-MA · 2021-09-20T10:24:21Z

shm/alcohol.cpp

+Cargo& Alcohol::operator+=(size_t amount) {
+    amount_ += amount;
+    return *this;
+}


What happend when you add to much cargo (more then capacity?) Do you handle this somewhere? If yes please move also below logic to this function (with substract) because now you have logic for substract in Cargo and for add in other class this is not god :)

nauka-programowania-MA · 2021-09-20T10:24:47Z

shm/alcohol.hpp

+class Alcohol : public Cargo {
+public:
+    Alcohol(const std::string& name, size_t amount, size_t basePrice, size_t percentage);
+    Alcohol() {};


nauka-programowania-MA · 2021-09-20T10:24:52Z

shm/alcohol.hpp

+public:
+    Alcohol(const std::string& name, size_t amount, size_t basePrice, size_t percentage);
+    Alcohol() {};
+    Alcohol(const std::string& name, size_t amount) : Cargo(name, amount) {};


nauka-programowania-MA · 2021-09-20T10:24:59Z

shm/alcohol.hpp

+    Alcohol(const std::string& name, size_t amount, size_t basePrice, size_t percentage);
+    Alcohol() {};
+    Alcohol(const std::string& name, size_t amount) : Cargo(name, amount) {};
+    ~Alcohol() override{};


nauka-programowania-MA · 2021-09-20T10:26:06Z

shm/cargo.cpp

+    , time_(time)
+    {
+        if (time_) {
+            time_->attachObserver(this);


You never detach observer. This will cause crash when this object will be deleted

nauka-programowania-MA · 2021-09-20T10:44:59Z

shm/store.cpp

+
+
+std::vector<std::shared_ptr<Cargo>>::iterator Store::findMatchCargo(const std::shared_ptr<Cargo> wantedCargo) {
+    auto find = std::find_if(stock_.begin(),


nauka-programowania-MA · 2021-09-20T10:45:05Z

shm/store.cpp

+                             stock_.end(),
+                             [&wantedCargo](const auto& cargo) { return cargo->getName() == wantedCargo->getName(); });
+
+    return find;


nauka-programowania-MA · 2021-09-20T10:45:16Z

shm/store.cpp

+    auto shipCargo = playerShip->findMatchCargo(cargo);
+    auto shipStock = playerShip->getCargosVector();


nauka-programowania-MA · 2021-09-20T10:45:34Z

shm/store.cpp

+    if (Alcohol* alcohol = dynamic_cast<Alcohol*>(cargo.get())) {
+        stock_.push_back(std::make_shared<Alcohol>(alcohol->getName(),
+                                                   amount,
+                                                   alcohol->getBasePrice(),
+                                                   alcohol->getPercentage()));
+    } else if (Fruit* fruit = dynamic_cast<Fruit*>(cargo.get())) {
+        stock_.push_back(std::make_shared<Fruit>(fruit->getName(),
+                                                 amount,
+                                                 fruit->getBasePrice(),
+                                                 fruit->getExpirationDate(),
+                                                 nullptr));
+    } else if (Item* item = dynamic_cast<Item*>(cargo.get())) {
+        stock_.push_back(std::make_shared<Item>(item->getName(),
+                                                amount,
+                                                item->getPrice(),
+                                                item->getRarity()));
+    }


use clone method

nauka-programowania-MA · 2021-09-20T10:45:45Z

shm/store.cpp

+            int more_stuff_in_store = 1;
+            int less_stuff_in_store = 0;
+            int adding_taking_max = 10;
+            int adding_taking_min = 1;


…small bugs fixed

ziobron and others added 30 commits June 11, 2021 19:12

fix coders-school#30

b358851

fix coders-school#84

c5340c8

fix coders-school#88, module3 almost removed

220bf13

Update 09-operators.md

44b8e81

Project start. First concept of files structure

5fc1b6f

Files cargo.cpp and ship.cpp created. Methods impementations moved th…

ea70a73

…ere (from hpp files).

Task 'Zadanie 2' completed. Constructor and getters added to the clas…

5f82ef7

…s 'Cargo'.

Adding operator ==

268dd71

Initialize files and made first functionality

1f17478

Added getPosition, Initialization, default constructor, some addition…

3f5d8f7

…al changes

Added island.cpp and island.hpp files

cd73046

Adding player.hpp

92d4e90

Adding player.cpp, player.hpp -corrected

ae6a443

getSpeed() implemented

99cdf86

implemented getCargo()

daa404b

corrected

8637398

'shm' and 'shmD4art' (zadanie3) branches megred

ac8dc4b

Merge branch 'shmRegis' (zadanie 4) into 'shm'

52bf2f5

Changed capital letter in fiilenames Map.cpp and Map.hpp. Included is…

b1fe926

…land.hpp in map.hpp.

Merge branch 'shmWoj'(zadanie 7) into 'shm'

75cb5a2

some changings in hpp i cpp files

f0bd5b5

Make some changes, and added getIsland function

714a9ba

Merge branch 'shmWoj'(with some corrections in Wojtek's tasks) into shm

f7233b5

Merge branch 'shm_zad6_regis' into shm

9967da7

Changes changes changes

c4a1c7b

some cleaning in cargo class

5a4cf38

remove 'basePrice' comparison in operator== in Cargo class

18f68ee

Addign countAvailbaleSpace

b212c45

Changes in Island class: better format-style, and improvemenet of ope…

3c8a7d7

…rator== in subclass Coordinates

fixing

4c184e8

bartosz-gruszczyk and others added 15 commits August 29, 2021 16:43

teamwork improvements 1

6dee2fd

pointer to owner added to class Ship

fda7c7b

nextDay() in Fruit class

4dca07a

teamork final commit

5c2c99e

nextDay() in store repaired

897ac40

Vector of shared_ptr removed from Cargos

f89d725

Segmentatio fault disaster

407dc63

Adding new functionalities to game

f376156

Some more changes and checking of possiblities

482f093

Only sell to write (I hope)

5fc35a9

Almost, ALMOSTgit add .

81bc456

Only some esthetic to done (I hope)

83216df

Only some esthetic to done (I hope) vol2

f78999f

finally done

3b60c1c

finally done2

a3dff7b

ziobron added the Premium label Sep 13, 2021

ziobron assigned nauka-programowania-MA Sep 13, 2021

ziobron requested a review from nauka-programowania-MA September 13, 2021 19:36

lukasz-kukulka reviewed Sep 14, 2021

View reviewed changes

nauka-programowania-MA requested changes Sep 20, 2021

View reviewed changes

Regggis and others added 8 commits September 23, 2021 20:42

Some changes after review

4a94837

Operators and polymorphism left to do

f31e2cd

Fixed bug where we cannot buy more stuff of the same object

6310af7

Operators removed from Cargo; const shared_ptr reference everywhere; …

4d5803a

…small bugs fixed

Ship TEST implementation

2a8230f

Constexpr Coordinates working

b058834

Polimorphism / functions commented

337b091

All review problems resolved

e1399df

ziobron requested a review from nauka-programowania-MA October 21, 2021 18:33



		std::vector<std::shared_ptr<Cargo>>::iterator Store::findMatchCargo(const std::shared_ptr<Cargo> wantedCargo) {
		auto find = std::find_if(stock_.begin(),

		auto shipCargo = playerShip->findMatchCargo(cargo);
		auto shipStock = playerShip->getCargosVector();

		}
		void Ship::nextDay()

Conversation

bartosz-gruszczyk commented Sep 13, 2021

Uh oh!

lukasz-kukulka left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ziobron commented Sep 14, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Comments